From c936aa953faf4ab85311f1eccd1e8be6f161be10 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Wed, 23 Jul 2008 20:17:54 -0700 Subject: [PATCH] Fix save when select-safe-coding-system-accept-default-p is a function. --- debian/changelog | 7 +++++- .../patches/fix-mule-select-safe-coding.diff | 25 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 debian/patches/fix-mule-select-safe-coding.diff diff --git a/debian/changelog b/debian/changelog index 0430413295d..f5965479d89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,12 @@ emacs22 (22.2+2-3) unstable; urgency=low Leave that up to emacsen-common. Thanks to Sven Joachim . (closes: #490524) - -- Rob Browning Wed, 23 Jul 2008 19:31:57 -0700 + * Don't prematurely raise an error when trying to save a non-ASCII + buffer when select-safe-coding-system-accept-default-p is set to a + function. Thanks to Jun Inoue . + (closes: #488427) + + -- Rob Browning Wed, 23 Jul 2008 19:58:11 -0700 emacs22 (22.2+2-2) unstable; urgency=medium diff --git a/debian/patches/fix-mule-select-safe-coding.diff b/debian/patches/fix-mule-select-safe-coding.diff new file mode 100644 index 00000000000..c85f0f1cf0f --- /dev/null +++ b/debian/patches/fix-mule-select-safe-coding.diff @@ -0,0 +1,25 @@ +* A problem with saving non-ASCII buffers has been fixed. + Patch: fix-mule-select-safe-coding.diff + Provided-by: Jun Inoue + Date: Sun, 29 Jun 2008 05:07:24 +0900 + Added-by: Rob Browning + Status: incorporated upstream + + Previously, Emacs would raise an error if even one coding system was + rejected when trying to save a buffer containing non-ASCII text when + select-safe-coding-system-accept-default-p was set to a function. + Now Emacs should continue. + +Index: sid/lisp/international/mule-cmds.el +=================================================================== +--- sid.orig/lisp/international/mule-cmds.el ++++ sid/lisp/international/mule-cmds.el +@@ -733,7 +733,7 @@ + (let ((pos (point)) + (fill-prefix " ")) + (dolist (x (append rejected unsafe)) +- (princ " ") (princ (car x))) ++ (princ " ") (princ x)) + (insert "\n") + (fill-region-as-paragraph pos (point))) + (when rejected diff --git a/debian/patches/series b/debian/patches/series index 81da874f99a..1328680dca6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,4 +9,5 @@ avoid-fakemail-mail-loss.diff version-mention-debian.diff fix-vcdiff-tmp-file-handling-cve-2008-1694.diff make-fast-lock-cache-directories-risky-cve-2008-2142.diff +fix-mule-select-safe-coding.diff autofiles.diff -- 2.30.2